*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c309aeb9699f459ad6daf475e9a35496ec45c486..ba09ae38209c0e9e9ad05ac16248f3d4de0c7edd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2001-04-23  John Wiegley  <johnw@gnu.org>
+
+       * eshell/em-unix.el (eshell/diff): Fixed problems that were
+       occurring with Emacs 21's diff.el/compile.el interaction layer.
+
+2001-04-23  Colin Walters  <walters@cis.ohio-state.edu>
+
+       * eshell/esh-cmd.el (eshell-find-alias-function): Return t in the
+       case where the function was defined in a file, but not part of an
+       eshell module.
+
 2001-04-23  John Wiegley  <johnw@gnu.org>
 
        * eshell/em-smart.el (eshell-smart-redisplay): Added some safety